Remove scraggling conflict marker.
authorrobertl <robertl@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Wed, 19 Nov 2008 04:23:53 +0000 (04:23 +0000)
committerrobertl <robertl@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Wed, 19 Nov 2008 04:23:53 +0000 (04:23 +0000)
commit16085366511dc8e8505a722098d553f6c196f0b2
tree6b2c0b52e80e5d233afdd8540d7ac64bc51731e9
parent8bb5aae62e48681e796935abd2490e15a7c4cbc0
Remove scraggling conflict marker.
gpsbabel/testo